Merge tag 'v1.6.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 13:55:31 +0000 (08:55 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 13:55:31 +0000 (08:55 -0500)
Version 1.6.1


Trivial merge