sync with Context as of 2013-06-04
sync with Context as of 2013-06-09
Merge pull request #14 from phi-gamma/master

sync