Merge tag 'v1.2.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 18:36:30 +0000 (14:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 18:36:30 +0000 (14:36 -0400)
Version 1.2.1


Trivial merge