Merge branches 'master' and 'master' of https://github.com/Arsey/wp_kiwi
server changes commit