Merge tag 'v1.5.7' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 15:11:00 +0000 (10:11 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 15:11:00 +0000 (10:11 -0500)
Version 1.5.7


Trivial merge