Merge branch 'master' into cory_cxx_generator