Fixed weird merge problem again
Merge branch 'master' into yaml-loading