Modifications made at GEC16 that were not checked in
Merge remote-tracking branch 'origin/master'