Merge branch 'hotfix/2.0.2' v2.0.2
authorIan Weller <ian@gaslightmedia.com>
Wed, 24 Feb 2016 14:47:18 +0000 (09:47 -0500)
committerIan Weller <ian@gaslightmedia.com>
Wed, 24 Feb 2016 14:47:18 +0000 (09:47 -0500)

Trivial merge