Merge branch 'release/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Mar 2016 21:05:30 +0000 (16:05 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Mar 2016 21:05:30 +0000 (16:05 -0500)

Trivial merge