Merge branch 'upstream'
Merge branch 'upstream'
Merge branch 'upstream'
Merge branch 'upstream'
Merge branch 'upstream'
add configuration options for java gateway
default to 0 java pollers
Merge pull request #84 from RiotGames/java_gateway

Java gateway configuration