Merge branch 'hotfix/2.0.12' v2.0.12
authorIan Weller <ian@gaslightmedia.com>
Mon, 27 Jun 2016 12:52:15 +0000 (08:52 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 27 Jun 2016 12:52:15 +0000 (08:52 -0400)

Trivial merge