Merge tag 'v1.0.36' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 17 Jul 2017 19:45:17 +0000 (15:45 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 17 Jul 2017 19:45:17 +0000 (15:45 -0400)
version 1.0.36


Trivial merge