Merge branch 'release/1.6.11' v1.6.11
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Feb 2017 15:59:03 +0000 (10:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Feb 2017 15:59:03 +0000 (10:59 -0500)

Trivial merge