Merge tag 'v1.2' into develop develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Mar 2017 14:48:25 +0000 (10:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Mar 2017 14:48:25 +0000 (10:48 -0400)
Version 1.2.0


Trivial merge