ErikZalm/Marlin — pull request #1217 by boelle (2014-12-21 14:12:06+00:00)
Title: Revert "Merge pull request #1213 from ErikZalm/Marlin_v1"

Reverts ErikZalm/Marlin#1216