ErikZalm/Marlin — pull request #1269 by Wurstnase (2014-12-29 22:19:33+00:00)
Title: Logic error correction

#1265