Merge tag 'v1.2.25' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 14:49:09 +0000 (10:49 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 14:49:09 +0000 (10:49 -0400)
version 1.2.25


Trivial merge