Sync'd branch integration/b2g-inbound with upstream @ Mon Nov 10 14:50:25 PST 2014