Merge branch 'master' into cmake_build
authorJosh Bialkowski <josh@skyd.io>
Fri, 20 Nov 2015 16:09:12 +0000 (08:09 -0800)
committerJosh Bialkowski <josh@skyd.io>
Fri, 20 Nov 2015 16:09:12 +0000 (08:09 -0800)

Trivial merge