Merge tag 'v1.6.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 17:28:43 +0000 (12:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 17:28:43 +0000 (12:28 -0500)
Version 1.6.5


Trivial merge