Merge commit 'upstream/master'

diff --cc view/theme/diabook/style-network.css
Simple merge

diff --cc view/theme/diabook/style-profile.css
Simple merge

diff --cc view/theme/diabook/style-settings.css
Simple merge

diff --cc view/theme/diabook/style.css
Simple merge