Sync'd branch integration/b2g-inbound with upstream @ Fri Nov  7 02:44:44 PST 2014