Strip [nil] from parameters hash

CVE-2012-2660
Merge remote-tracking branch 'sebbacon/2-3-stable' into 2-3-stable