Merge branch 'hotfix/1.1.4' v1.1.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 16:25:22 +0000 (12:25 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 16:25:22 +0000 (12:25 -0400)
commitf32cd280471b0fa0e62432795a327b211cff8ef6
treef4657eb1af0a252860a4b9060d2b6a8671c9466b
parenta1a28f0fb86ee7d266d12155221ad0b57bd01a06
parent614fcd7e20c7aec0a8cd7488d24111a0778a389e
Merge branch 'hotfix/1.1.4'