Sync'd branch integration/b2g-inbound with upstream @ Wed Nov 12 17:30:13 PST 2014