missing test.diff file for <% format %> test
Merge branch 'dev'