Merge pull request #727 from op-jenkins/op_update_05_11-7-2016

op-build update 11-7-2016