merge some stuff manually, the rest will be done with a apatch
merge mastertheknife's repo