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