Merge pull request #4857 from t-nelson/Gotham_13.2_backports
authorjmarshallnz <jcmarsha@gmail.com>
Mon, 9 Jun 2014 19:44:43 +0000 (07:44 +1200)
committerjmarshallnz <jcmarsha@gmail.com>
Mon, 9 Jun 2014 19:44:43 +0000 (07:44 +1200)
Gotham 13.2 backports


Trivial merge