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