fixing merge bugs
Merge branch '0.3.5-dev' of https://github.com/bristleback/bristleback into 0.3.5-dev