Changed back from Java 1.7 to 1.6.
Merge remote-tracking branch 'origin/master'