Merge tag 'v1.2.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 31 Dec 2015 19:34:21 +0000 (14:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 31 Dec 2015 19:34:21 +0000 (14:34 -0500)
Version 1.2.0


Trivial merge