chriskoz/Marlin — pull request #3 by chriskoz (2014-12-31 07:45:59+00:00)
Title: Merge pull request #1238 from ErikZalm/Marlin_v1

Moving from main to stable to get stable even with main