Minor cleanup.
Merge commit '19dccff' into develop