Sync'd branch integration/b2g-inbound with upstream @ Wed Nov 12 15:39:59 PST 2014