Merge tag 'v1.1.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 13:45:30 +0000 (08:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 13:45:30 +0000 (08:45 -0500)
Version 1.1.2


Trivial merge