Last commit (gregordemo)

Note to self: find way to merge conflicting branches in CCsv5