Merge commit '33e09663f07495834766dc14303266a0374664b4'
Merge commit '00f0e7c8ae0d160af55e4279e2f9549bd71342e0'
Fixing make test in master branch
Minor typographical edits