Merge branch 'master' into dev
Merge branch 'master' into dev
gcc fix
break up line gcc doesn't like
gcc fix?
fix trait invocation
build fixes
Merge branch 'dev'