Merge pull request #674 from op-jenkins/op_update_137_10-5-2016

op-build update 10-5-2016