Merge commit 'fda63e5f37f0d6ac532c7543d1ad42a47e1f23fa'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.