Update to master 521797a

wiki: e505a7c