Merged in 'origin/master' with changes from schoen.