20141110 - Cleanup from branch issues