Weekly commit 26.08.13