Merge branch 'release/1.2.0'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 15:26:33 +0000 (11:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 15:26:33 +0000 (11:26 -0400)

Trivial merge