Merge branch 'hotfix/1.0.28' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 25 Aug 2014 20:05:34 +0000 (16:05 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 25 Aug 2014 20:05:34 +0000 (16:05 -0400)

Trivial merge