Sync'd branch integration/b2g-inbound with upstream @ Tue Nov  4 05:13:37 PST 2014