doesn't work...
Merge branch 'stable-0.3' into stable-0.4