Merge tag 'v1.2.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Feb 2016 17:34:49 +0000 (12:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Feb 2016 17:34:49 +0000 (12:34 -0500)
Version 1.2.0


Trivial merge