Sync'd branch integration/b2g-inbound with upstream @ Wed Nov 12 08:07:14 PST 2014