Merge branch 'release/1.2.0' v1.2.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 31 Dec 2015 19:34:11 +0000 (14:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 31 Dec 2015 19:34:11 +0000 (14:34 -0500)

Trivial merge