Merge pull request #1122 from wghoffa/060217_fw_update

op-build update 6-2-2017