Merge into master from pull request #349:
Merge ihplus branch to master (https://github.com/floodlight/loxigen/pull/349)