Merge tag 'v1.2.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 17:58:11 +0000 (13:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 17:58:11 +0000 (13:58 -0400)
Version 1.2.1


Trivial merge