Sync'd branch integration/b2g-inbound with upstream @ Thu Nov 13 06:16:02 PST 2014