sync with Context as of 2013-08-12
sync with Context as of 2013-08-24