Merge tag 'v1.0.36' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 12 Apr 2016 19:06:28 +0000 (15:06 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 12 Apr 2016 19:06:28 +0000 (15:06 -0400)
version 1.0.36


Trivial merge