switch to ir_black
merge master