Sync with ValentinAK changes on 2013-01-15