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