Merge branch 'hotfix/1.1.8' v1.1.8
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 16:58:27 +0000 (11:58 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 16:58:27 +0000 (11:58 -0500)
commite9dd69ace49e6f4abb267cea8724200c5795cf29
tree1872f1e9afb63e827c4de1ee9897eae65c9ef4da
parentc599064bd37802e670aee67290aa76ab197d7af6
parentefe460a321292e9bdb7dd17413b8810c0a7ea5e1
Merge branch 'hotfix/1.1.8'