first batch of changes from ubuntu 13.10