Fixes quarter in DataGenerator.java
Merge branch 'master' into alan