Merged bug1 into stable
Merge branch 'master' into stable
created f10
created f11 and modified f10
Merged bug3 into master