Merge ipascual:master with converttt:master.