Merge branch 'hotfix/2.0.8' v2.0.8
authorIan Weller <ian@gaslightmedia.com>
Wed, 6 Apr 2016 18:02:04 +0000 (14:02 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 6 Apr 2016 18:02:04 +0000 (14:02 -0400)

Trivial merge