Bring stable 1.1 alpha changes into master