Merge tag 'v1.2.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 16:52:51 +0000 (11:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 16:52:51 +0000 (11:52 -0500)
Version 1.2.1


Trivial merge