Merge branch 'Mario/sniperrifle'
authorMario <mario.mario@y7mail.com>
Mon, 15 Feb 2016 01:33:50 +0000 (11:33 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 15 Feb 2016 01:33:50 +0000 (11:33 +1000)

Trivial merge