Merge branch 'release/1.6.7' v1.6.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 18:59:44 +0000 (13:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 18:59:44 +0000 (13:59 -0500)

Trivial merge