Merge commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c' into kraken * commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c': Fix possible security issue.
Merge commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c' into kraken * commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c': Fix possible security issue.