Merge branch 'release/1.6.0' v1.6.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:22:08 +0000 (14:22 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:22:08 +0000 (14:22 -0500)

Trivial merge