Merge pull request #2079 from reaperhulk/branch-fixes

Branch fixes