Merge tag 'v2.1.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Feb 2017 13:06:11 +0000 (08:06 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Feb 2017 13:06:11 +0000 (08:06 -0500)
Version 2.1.1


Trivial merge