Merge branch 'TimePath/items' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 29 Oct 2015 08:19:33 +0000 (08:19 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 29 Oct 2015 08:19:33 +0000 (08:19 +0000)
Cleanup item pickups (M merge request)

See merge request !245


Trivial merge