20130505 - See readme.md for changes
Merge remote-tracking branch 'upstream/master'