Merge branch 'release/1.2.1'
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Jul 2015 19:53:59 +0000 (15:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Jul 2015 19:53:59 +0000 (15:53 -0400)

Trivial merge