Merge commit '7d73d61d61522f72a8f0510d1b2490f953d9635b'

Conflicts:
	contrib/themes/blue/images/wordmark.png
	contrib/themes/oak/images/wordmark.png
drop "alpha" (subtree problems)