Merge pull request #618 from laanwj/issue615