Previous HEAD position was b3bd29d15 Merge branch 'master' into 1.0
HEAD is now at 61bd51732 Merge branch 'master' into 1.0
Resolved commit: 61bd5173220d19925ad8220db9152a75c881ea73