ErikZalm/Marlin — pull request #1283 by i-make-robots (2014-12-31 20:40:50+00:00)
Title: issue 968 rebased for dev branch

- added max_ok_timeout to prevent print hangs