Sync'd branch integration/b2g-inbound with upstream @ Mon Nov 10 22:26:57 PST 2014