name now displays on constrained features
Merge remote-tracking branch 'upstream/master' into fitniggles
Merge pull request #423 from jabooth/fitniggles

name now displays on constrained features