Pulling bugfixes from master to 1.1.0-SNAPSHOT