Merge branch 'master' of https://github.com/nivin/gigaspaces-wiki-jekyll