update to master 2013-05-13 and tweak comment in config