Monkey patch for CVE-2013-6414
Merge branch '5-4-stable' of github.com:gitlabhq/gitlabhq into 5-4-stable