Merge "Introduce default expiry time for special:block (bug 32178)"