Merge tag 'v1.6.11' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Feb 2017 15:59:10 +0000 (10:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Feb 2017 15:59:10 +0000 (10:59 -0500)
Version 1.6.11


Trivial merge