Merge pull request #2061 from seek4science/issue-2059 #6454

Job	Run time
Tests (mysql, rails test test/unit)	26m 29s
Tests (mysql, rails test test/functional)	35m 57s
Tests (mysql, rails test test/integration)	17m 49s
Tests (mysql, rspec spec)	3m 6s
Tests (mysql, rake assets:precompile)	3m 22s
Tests (mysql, rake db:setup)	3m 18s
Tests (mysql, rake db:migrate)	3m 43s
Tests (mysql, rake seek:upgrade)	3m 22s
Tests (sqlite3, rails test test/unit)	20m 8s
	1h 57m 14s

Provide feedback