Bringing all changes from FreePBX svn over
Fixing