Update c4science branch from upstream
-------------------------------------

git fetch upstream
git merge --squash upstream/stable
# Fix conflict
git commit -am "Merge with Stable Week XXX"


TODO
----

- Tester git rerere