Sync'd branch integration/b2g-inbound with upstream @ Mon Nov 10 18:30:01 PST 2014