Merge remote branch 'savannah/master' into sourceview