Merge branch 'hotfix/1.2.4' 1.2.4
authorIan Weller <ian@gaslightmedia.com>
Tue, 17 Jan 2017 19:57:56 +0000 (14:57 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 17 Jan 2017 19:57:56 +0000 (14:57 -0500)

Trivial merge