Removed duplicate dependency (commons-lang3).
Merge origin/master