Merge tag 'v1.1.8' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Jan 2015 18:35:36 +0000 (13:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Jan 2015 18:35:36 +0000 (13:35 -0500)
Version 1.1.8


Trivial merge