Merge pull request #699 from op-jenkins/op_update_05_10-19-2016

op-build update 10-19-2016