Pull from gregrebholz:Marlin_v1 on 12-20-2014