Fixes.
Merge origin/master