* Added missing changes to commit 06eaa5ab9951ad2ef45ac82695021e03bffb4165.
Merge origin/master