versions 0.6 current work.
Merge commit '8c2e9df329303952b724dba194176faa3f27883f' into version060
Merge branch 'version060' into api201408

Conflicts:
	src/main.cpp