Merge remote branch 'repo/master' into stats

Conflicts:

	datapath/table-mac.c

diff --cc datapath/datapath.c
Simple merge

diff --cc datapath/forward.c
Simple merge

diff --cc datapath/forward.h
Simple merge

diff --cc include/openflow-netlink.h
Simple merge

diff --cc include/openflow.h
Simple merge