Merge pull request #491 from op-jenkins/op_update_6-8-2016

op-build update 6-8-2016