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