Merge tag 'v2.1.7' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Jun 2016 12:44:57 +0000 (08:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Jun 2016 12:44:57 +0000 (08:44 -0400)
Version 2.1.7


Trivial merge