Fixing GET_SHAPE macro
Merge remote-tracking branch 'upstream/master' into physics_api_fix_2012-03-11