1.9.3
Merge branch 'master' into experimental