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