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