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