20140509-0739-DWDT Still working on registration bugs