Bring the first bits of Stomp 1.1 over from main codebase