Merge from afeld:master