re-0.4.9 -> re-0.4.10
master merge re-0.4.10