Merge tag 'v1.2.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 14:21:57 +0000 (10:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 14:21:57 +0000 (10:21 -0400)
Version 1.2.1


Trivial merge