Merge pull request #39 from fcorneli/master

EAP 6.3.1 support