Merge branch 'TimePath/inventory_tweaks'
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 26 Dec 2016 03:42:43 +0000 (14:42 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 26 Dec 2016 03:42:43 +0000 (14:42 +1100)

Trivial merge