Merge branch 'master' into John
put text align back

put text align back
Merge branch 'John'