Dev labelization patch 0 cleaner

Don't be afraid of non-automatic merging. If there is one thing I can do now, it's deal with "<<<<<<
>>>>>> {} <<<<<<< 7c8c38c142cf4091274aa8e1b68920676483751f CmtMsg" blocks, and, if it's for a few files only, I can walk you through the process. 

Well, never mind. It looks like this patch is going to need some patching. 
12 hours of sleep have restored my faith in humanity.