Merge branch '419_broken_search_glib_less_2_14'