Sync'd branch integration/b2g-inbound with upstream @ Mon Nov 10 13:07:23 PST 2014