Merge branch 'hotfix/1.2.25' v1.2.25
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 14:48:45 +0000 (10:48 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 14:48:45 +0000 (10:48 -0400)

Trivial merge