Summer 2014 Commit. More on timeout plus small fixes