am 3de05ff: Merge change 586 into donut

Merge commit '3de05ffb910b572f7816b838628567c760540f7d'

* commit '3de05ffb910b572f7816b838628567c760540f7d':
  Manage imagecache ram budget