Ignore debug/*
merge with upstream