Remove unnecessary binding (in both senses)
Merge branch 'master' into bleeding_edge