Merge remote-tracking branch 'volth/release-1.1pre16-rtt' into 1.1