Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 01:38:48 PST 2014