Adds enabled mapping option (default true)
Merge pull request #418 from blongden/2.0.x

Adds enabled mapping option (default true)
Merge branch '2.0.x' into 2.1.x
Merge branch '2.1.x'