5.x-1.0-beta2
37ef2e4b · merging changes from trunk. ·