Merge tag 'v1.5.7' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Feb 2017 20:19:13 +0000 (15:19 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Feb 2017 20:19:13 +0000 (15:19 -0500)
Version 1.5.7


Trivial merge