Hope this is OK for Jacob.

Closed Sid Sijbrandij requested to merge jv into master Dec 30, 2015