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