Merge tag 'v1.2.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Oct 2016 13:43:10 +0000 (09:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Oct 2016 13:43:10 +0000 (09:43 -0400)
Version 1.2.0


Trivial merge