changes to accomodate addition of slepc
Merge remote branch 'upstram/master'