20130722 - See readme.md
Merge remote-tracking branch 'upstream/master'