Merge branch 'fix-haz-map-uhs-filename' of http://github.com/larsbutler/oq-engine
Merge branch 'master' of github.com:gem/oq-engine
Merge branch 'master' of github.com:gem/oq-engine
Merge branch 'clean-up-db' of http://github.com/larsbutler/oq-engine into performance-report
Added a better performance_view
Better performance output
Merge branch 'master' of github.com:gem/oq-engine into performance-report
Heavily changed and simplified the PerformanceMonitor, inspired by memory_profiler
Small fix
Fixed docstrings and further cleanup
Distinguished the flags profile_pymem and profile_pgmem
Merge pull request #1167 from gem/performance-report

Improved the memory profiling