20141229 - Cleanup from branch issues