Merge pull request #94 from mchf/Code-11-SP2

No objections and already in SP3. Merging.