Merging latest crxmake into ciel's