Properly set options on comment nodes.
Merge branch 'stable'