Fix critical vulnerability: SA-CORE-2014-004
Merge branch 'release/2014-09-03'