Merge tag 'v2.1.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Jul 2017 12:44:46 +0000 (08:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Jul 2017 12:44:46 +0000 (08:44 -0400)
Version 2.1.2


Trivial merge