Merge pull request #676 from op-jenkins/op_update_05_10-6-2016

op-build update 10-6-2016