minor - guard haml helper against nil name
Merge remote-tracking branch 'crabgrass/develop' into develop