Fixed deprecation warnings for cache_page and truncate_words
Merge remote-tracking branch 'upstream/master' into upmaster