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