20141119 - Cleanup from branch issues