Fix merge bug.
Merge branch 'dev' of github.com:planctechnologies/gns3-gui into dev