ErikZalm/Marlin — pull request #1277 by thinkyhead (2014-12-30 15:36:47+00:00)
Title: Fix regressions affecting compilation

This fixes two regressions, caused by #1167 and #1191 .