Merge tag 'v1.1.12' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 18:12:12 +0000 (14:12 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 18:12:12 +0000 (14:12 -0400)
version 1.1.12


Trivial merge