Stamp production release
stamp new stable release
Merge branch 'master' into production

Conflicts:
	pganalyze-collector.py
Merge branch 'master' into production
Merge branch 'master' into production
Merge commit 'f8a55db99143ceae1965e6d109442426b1a0c723' into production
Stamp 0.1.5 production
merge
Merge production
Resolve merge conflicts
bloody merge conflict
Merge branch 'master' into production

Conflicts:
	pganalyze-collector.py
Merge branch 'production'

Conflicts:
	pganalyze-collector.py