commit 564b70ae1a9b33096edf9f8034c981e48438cd60 Merge: e8703f4 171e21d Author: Sérgio M. Basto <sergio at serjux.com> Date: Thu Sep 15 11:08:48 2016 +0100 Merge branch 'el5' into el6 ---