House keeping 2013

Change-Id: Ia7baf5f8600b2db7dee4674c98d446e9f22ae889
Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>