Daily commit 18.05.2014 -p2