Merged bugfix from 2.7.3-pre.
1 file changed