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