Merge branch 'hotfix/1.0.15' v1.0.15
authorIan Weller <ian@gaslightmedia.com>
Mon, 15 Feb 2016 20:51:47 +0000 (15:51 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 15 Feb 2016 20:51:47 +0000 (15:51 -0500)
commiteabb875d899c7a60e8d7659588956f2ad02601fe
treee97d3c8b3714b0473807507b19fe756fe20d3413
parentc9e8622d0770dac25d938580c703348cdc27b17d
parentf9eb631d6aa543e3553969fcde30d784d99c711e
Merge branch 'hotfix/1.0.15'