Merge commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d' * commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d': Add "TYPE=" to type attribute when appropriate.
Merge commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d' * commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d': Add "TYPE=" to type attribute when appropriate.