Sync'd branch integration/b2g-inbound with upstream @ Fri Nov  7 11:05:47 PST 2014