Merge tag 'v1.0.17' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:36:00 +0000 (17:36 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:36:00 +0000 (17:36 -0500)
v1.0.17


Trivial merge