Merge remote-tracking branch 'origin/2ndpullrequest' into cm_master
Merge branch 'config_stuff' into cm_master