Merge changes I0476a0e0,Ib36051d4 into gingerbread

* changes:
  Fix "Add skip_themes directive to build process"
  Fix compcache