Make source_with_oneline_annotations.php valid PHP
Merge branch '1.2'