sync capy and corosio changes#35

ashtum merged 3 commits into

cppalliance:developcppalliance/burl:developfrom

ashtum:workashtum/burl:workCopy head branch name to clipboard