Updating to bopm 3.1.3 upstream source