Merge branch 'hotfix/1.2.17' v1.2.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 18:54:27 +0000 (13:54 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 18:54:27 +0000 (13:54 -0500)

Trivial merge