Merged mainline.

diff --cc pg_activity.spec
index 3ee62761b96f3413457022774085b52b708f205d,4c29e09389529a4eaa57c1a7311f05e8d06b8bfd..21ffac508e35fbb9727ea06782569433be051304
--- 1/pg_activity.spec
--- 2/pg_activity.spec
+++ b/pg_activity.spec
@@@ -7,15 -7,14 +7,15 @@@
  
  # Conditional build:
  %bcond_without        tests   # do not perform "make test"
 -%bcond_without        python2 # CPython 2.x module
 +# NOTE: building both python2 and python3 results with broken "binaries"
 +%bcond_with   python2 # CPython 2.x module  
  %bcond_without        python3 # CPython 3.x module
  
- %define       module  pgactivity
+ %define               module  pgactivity
  Summary:      A top like application for PostgreSQL server activity monitoring
  Name:         pg_activity
 -Version:      1.3.0
 -Release:      4
 +Version:      1.3.1
 +Release:      1
  License:      distributable
  Group:                Libraries/Python
  Source0:      https://github.com/julmon/pg_activity/archive/v%{version}.tar.gz