Merge branch 'ps-rails5.2' into ps-test
Conflicts:
.travis.yml
script/validate_structure_file.rb
AMD64
no language set
Git