Merge branch 'hotfix/1.5.1' v1.5.1
authorIan Weller <ian@gaslightmedia.com>
Wed, 1 Jun 2016 18:34:24 +0000 (14:34 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 1 Jun 2016 18:34:24 +0000 (14:34 -0400)

Trivial merge