Sync'd branch integration/b2g-inbound with upstream @ Fri Nov  7 07:43:48 PST 2014