Sync'd branch integration/b2g-inbound with upstream @ Fri Nov  7 17:57:51 PST 2014