* Fix stack overflow error
Updating gradle wrapper to 1.12
Merge pull request #260 from 6wunderkinder/master

* Fix stack overflow error
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/org/java_websocket/SSLSocketChannel2.java