Merge tag 'v1.3.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 9 Sep 2016 14:37:46 +0000 (10:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 9 Sep 2016 14:37:46 +0000 (10:37 -0400)
Version 1.3.6


Trivial merge