Merged to the dev branch. Thanks, @amarphule, and @BramDriesen.