Merge branch 'master' into TimePath/issues/1428
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 20 Dec 2014 11:00:02 +0000 (22:00 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 20 Dec 2014 11:00:02 +0000 (22:00 +1100)

Trivial merge