Merged with origin 20.12.2013 02:00:00