Merge tag 'v1.2.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Oct 2016 15:26:55 +0000 (11:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Oct 2016 15:26:55 +0000 (11:26 -0400)
Version 1.2.1


Trivial merge