Sync'd branch integration/b2g-inbound with upstream @ Fri Nov  7 01:49:46 PST 2014