Fixed some warnings.
Merge commit '8c28d78' into develop