Merge tag 'v1.2.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 17:08:04 +0000 (13:08 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 17:08:04 +0000 (13:08 -0400)
Version 1.2.1


Trivial merge