Merge pull request #866 from martijndegouw/master