merge port_kdevelop_4.7