Merge tag 'v1.0.36' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:21:24 +0000 (11:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:21:24 +0000 (11:21 -0500)
Version 1.0.36


Trivial merge