Merged pull request 271 and updated 2014.3 catalog for diff/junit