Merge branch 'bitfury' into knc