Merge tag 'v1.1.8' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Dec 2014 16:34:10 +0000 (11:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Dec 2014 16:34:10 +0000 (11:34 -0500)
Version 1.1.8


Trivial merge