Fix mis-merge in previous commit

Alvaro Herrera <alvherre@alvh.no-ip.org>

Commit: b7ca57ac0e80b8b511780ef1f19fa2124c901efb
Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: 2015-07-20T09:59:31Z
Releases: 9.6.0
Fix mis-merge in previous commit

Files