sync with Context as of 2013-07-14