Merged changes from Jesse
Try to merge with Jesse again
Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr