hotfix for CVE-2013-0156
Merge branch 'hotfix/cve-2013-0156' into develop

Conflicts:
	Gemfile.lock