cmake: patch that fixes scoping issue by re-declaring the variable in the parent scope.
runtime: minor swig fix of declaring std_string.i. Need for OS X 10.9.
Merge branch 'maint'
Merge branch 'master' into next