revup
Merge pull request #1066 from tobiasd/revup20140807

revup