almost final fixes for maintenance issues..
Merge remote branch 'origin/master'