Merge branch 'hotfix/1.0.17' v1.0.17
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 16:57:39 +0000 (12:57 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 16:57:39 +0000 (12:57 -0400)
commitf6b45de73abad705e1943247e3a937687edb561d
tree8b5a58e5189e0b367b7124beb99ac2feb145c8ea
parent1cbee0f1b73a63b30bc4da5aa6c6b19cf7658c51
parent53ce92ec7d67bfbcc2b1feb098bf7f8f1a2c45c6
Merge branch 'hotfix/1.0.17'