Merge branch 'hotfix/1.2.3' v1.2.3
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 17:27:47 +0000 (13:27 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 17:27:47 +0000 (13:27 -0400)

Trivial merge