Merging master

Merging omab's master.