Merge branch 'master' into dev
logging update
missing version number updates
Merge branch 'dev'