evolutions and test for issue #508
Merge branch '0.8.4' of https://github.com/giastfader/baasbox into 0.8.4