merge from nicklockwood:master