Cherry pick from "next" branch#45

gene1wood wants to merge 8 commits intomastermozilla/agithub:masterfrom

cherry-pick-from-nextmozilla/agithub:cherry-pick-from-nextCopy head branch name to clipboard