#fixed 25
Merge branch '1.1-stable'