Merge pull request #4716 from Memphiz/backportsnotspiff
authorjmarshallnz <jcmarsha@gmail.com>
Sat, 7 Jun 2014 05:19:22 +0000 (17:19 +1200)
committerjmarshallnz <jcmarsha@gmail.com>
Sat, 7 Jun 2014 05:19:22 +0000 (17:19 +1200)
Backports from nospiffs fork


Trivial merge