Merge branches 'redis' and 'simplexml-refactor'