Empty merge, thru 1c54cf0903, which are already in master

Merge commit '1c54cf0903cd81467ca41ec6733c459e10b22763'