Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into truffle-head
# Conflicts: # truffle/src/main/java/org/jruby/truffle/language/loader/SourceLoader.java