Merge pull request #1 from floodlight/master

Syncing with floodligh/loxigen
Merge branch 'master' into 13-support