Merge branch 'TimePath/cmake'
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 14 Apr 2016 12:16:44 +0000 (22:16 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 14 Apr 2016 12:16:44 +0000 (22:16 +1000)

Trivial merge