Merge tag 'v1.6.36' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Apr 2017 16:03:57 +0000 (12:03 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Apr 2017 16:03:57 +0000 (12:03 -0400)
Version 1.6.36


Trivial merge