[root]/src/helpers
merged r241-r244 from v0.5 branch into trunk
132 lines of code changed in 2 files: