Merge pull request #632 from op-jenkins/op_update_05_9-12-2016

op-build update 9-12-2016