Fix typo.
Fix another typo.
Update submodule.
Merge branch 'master' into vagrant