Merge pull request #758 from op-jenkins/op_update_05_11-21-2016

op-build update 11-21-2016