Merge remote-tracking branch 'illwieckz/lokipaths'
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 14 Apr 2016 07:04:11 +0000 (17:04 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 14 Apr 2016 07:04:11 +0000 (17:04 +1000)

Trivial merge