Sync'd branch integration/b2g-inbound with upstream @ Mon Nov 10 01:56:02 PST 2014