Merge tag 'v1.6.8' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Feb 2017 16:57:33 +0000 (11:57 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Feb 2017 16:57:33 +0000 (11:57 -0500)
Version 1.6.8


Trivial merge