20141109 - Cleanup from branch issues