Merge master into webapp-version-merge

@NightlyBuilds , this contains a few fixes.