Upmerged to latest Marlin version (2013-09-24)