Last commit before Friday meeting, cleaning and prepp.
Merge remote-tracking branch 'upstream/master'