Redmine 3093 fixed again. Please be careful with large merges.