removed === true from smarty helper
Merge branch '3.0' into 3.1