Updates for 2.11.1 rebuild
Merge pull request #60 from skyluc/release/3.0.4-2.11.1

Updates for 2.11.1 rebuild