Merge tag 'v1.2.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 14:12:35 +0000 (10:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 14:12:35 +0000 (10:12 -0400)
Version 1.2.1


Trivial merge