1.1

Put all stuff from master into 1.1