20141116 - Cleanup from branch issues