sync with Context as of 2013-05-09
make file lookups return string instead of pair
Merge commit '9f697f3c5f0e19ab3beab9a2891c42aa8cc8a325'
fix font type forcing