Merge branch 'release/1.2' v1.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 May 2016 14:12:59 +0000 (10:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 May 2016 14:12:59 +0000 (10:12 -0400)

Trivial merge