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