Due to IRC chat and 'notes' email
Merge branch 'ocelot-master'