Please merge ML_step ASAP
@kbringma branches are starting to diverge to much, with commits on the same files on them. That's why I've created the proposed-master branch, please merge other stable stuff here as well and branch of for new features/fixes etc.