Merge remote-tracking branch 'origin/master' into diff_navigation

# 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.
 * include upstream change
 * added dropdowns