JANRAIN-1123 Make changes more obvious
Merge branch 'bmock/dev/JANRAIN-1123/Make_changes_more_obvious'