Merge branch 'hotfix/1.2.3' v1.2.3
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 20:46:06 +0000 (16:46 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 20:46:06 +0000 (16:46 -0400)

Trivial merge