Merge tag 'v1.6.7' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 18:59:52 +0000 (13:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 18:59:52 +0000 (13:59 -0500)
Version 1.6.7


Trivial merge