Merge pull request #37 from lloydmeta/feature/2.11.0_support

Support for 2.11.0