Erikzalm Marlin Issue 935

Implements bugfix created on parent ErikZalm/Marlin branch -
https://github.com/ErikZalm/Marlin/commit/cf325ba240b574baab41ed0d5a990827d2fe9cbf