Sync'd branch integration/b2g-inbound with upstream @ Tue Nov  4 04:41:42 PST 2014