merged 14-06-01.patch
intro merged