Merge pull request #85 from adriaanm/2.10.x

2.10.x
Merge pull request #86 from adriaanm/2.10.x

enable s3 upload
scala indent fix from char-before to preceding-char (nil error)
Merge pull request #93 from linkenneth/master

[Branch changed to 2.10.x] Fixed Emacs scala-mode indent (nil bug)
Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-master
Merge pull request #106 from retronym/merge/2.10.x-to-master

Merge/2.10.x to master