commit of tests_070613_2320
Merge remote-tracking branch 'refs/remotes/origin/master'