Merge tag 'v1.2.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Oct 2016 15:21:28 +0000 (11:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Oct 2016 15:21:28 +0000 (11:21 -0400)
Version 1.2.0


Trivial merge