Sync'd branch integration/b2g-inbound with upstream @ Wed Nov 12 11:00:58 PST 2014