backported special_fn branch fix from MCP2
Merge remote-tracking branch 'upstream/master'
remove workaround after Kalmer's fix for 'branch'