Merge tag 'v1.2.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Mar 2016 21:05:39 +0000 (16:05 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Mar 2016 21:05:39 +0000 (16:05 -0500)
Version 1.2.1


Trivial merge