Merge with andrepl's master