fix #916

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
add changelog for #916/#917

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>