20141123 - Cleanup from branch issues