Merge branch 'release/1.2.0' v1.2.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Feb 2016 17:34:29 +0000 (12:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Feb 2016 17:34:29 +0000 (12:34 -0500)

Trivial merge