Pulled changes for 1.1