Merge pull request #673 from op-jenkins/op_update_05_10-5-2016

op-build update 10-5-2016