Fix for Java 6/7
Merge branch 'master' into skyrising-dev2
Latin bitches
Fixed size
Merge remote branch 'origin/master'
Merge remote branch 'origin/master' into skyrising-dev2