prepare to add -xdev option
Merge branch 'Centrify'