Merge tag 'v1.2.17' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 18:55:10 +0000 (13:55 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 18:55:10 +0000 (13:55 -0500)
merge brach with hotfix 1.2.17


Trivial merge