ErikZalm/Marlin — pull request #1255 by mattsch (2014-12-28 16:25:56+00:00)
Title: 503 fwretract dev branch

Hopefully this is all sorted now, updated pull against the Development branch for #1236