Current trunk.
Merge remote-tracking branch 'origin/trunk' into multiscale
Fixing a small typo.
Merged.
Merge remote-tracking branch 'origin/trunk' into multiscale