Merge branch 'release/1.6.5' v1.6.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 17:28:36 +0000 (12:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 17:28:36 +0000 (12:28 -0500)

Trivial merge