Merge master to sbt server

Remember - Travis is supposed to pass now, so wait for it :-)