Updated contrib modules ctools and OG
Removed ctools patch from make file
Merge remote-tracking branch 'origin' into release