Phone Support

Merged Sid Sijbrandij requested to merge phone-support into master