Merge pull request #147 from marttipiirainen/master

Update to upstream version 1.14