ofsoftswitch13: cc167ab Merge pull request #72 from mcanini/upstream