Merge pull request #697 from aeber/master