Merge tag 'v1.6.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:22:14 +0000 (14:22 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:22:14 +0000 (14:22 -0500)
Version 1.6.0


Trivial merge