Merge "Updated comment to remove copy+paste error." into devel/master