Fix mis-merge in previous commit

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

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

Files