Merge latest release by erendrake