DMI merges/replaces
Just 11 more to go
Final commit. We should be all sync'd up with Bay as of 12th March 2014 now.