Merge pull request #326 from op-jenkins/op_update_1-6-2016

op-build update 1-6-2016