fixing 4.6 alpha...; added timeouts to prevent never ending builds