wqMerge branch 'master' of https://github.com/kimkulling/cppcore
wqMerge branch 'master' of https://github.com/kimkulling/cppcore

kimkulling/cppcore,kimkulling/cppcore,kimkulling/cppcore,kimkulling/cppcore