Merge pull request #790 from op-jenkins/op_update_05_12-23-2016

op-build update 12-23-2016