Sync'd branch integration/b2g-inbound with upstream @ Wed Nov  5 11:28:39 PST 2014