Merge branch 'patch-6' of https://github.com/yuvaldori/gigaspaces-wiki-jekyll