Pull in amebels scm fixes

This provides a minor usability fix