Fix #90, also for OF 1.2
Merge branch 'master' into issue90

Conflicts:
	scripts/of_controller_v4.erl
Merge pull request #112 from FlowForwarding/issue90

Fix #90, also for OF 1.2