Merge tag 'v1.2.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 15:58:23 +0000 (10:58 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 15:58:23 +0000 (10:58 -0500)
Version 1.2.0


Trivial merge