Merge pull request #1935 from reaperhulk/cp-bindings-redux

we also need some stack manipulation macros