Fix for Issue #12, custom classpath not merging with default classpath
Merge pull request 0034028 from Chris Yang