Fix grammar
Merge branch 'shayne'