update #18
Merge branch '1.1-stable'