Merge tag '1.0.26' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 10 Aug 2016 19:37:27 +0000 (15:37 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 10 Aug 2016 19:37:27 +0000 (15:37 -0400)
version 1.0.26


Trivial merge