Merge "Change default grab/selection handles." into devel/master