Fix buildfile.
Pin to jdk 1.6 bytecode.
Merge branch 'master' into stable

* master:
  Pin to jdk 1.6 bytecode.
  Fix buildfile.