Merge remote-tracking branch 'Chris/master'
Merge remote-tracking branch 'Mfioravan/master'