Everything in master is up-to-date with both our changes from 530pm Sunday, except for the 2 JAR files that need to be added to your project locally