Updating master for version 1.1.0