Commits in stomp/mainline:master