Merge branch 'master' into cmusselle
Authored by: cmusselle 2015-11-30
Parents: [38370c][9074d1]
Child: [243955]