Merge the dev branch to trunk.

git-svn-id: http://fusionpbx.googlecode.com/svn/trunk@3695 e2954ef0-caed-11de-bd98-e341d93cc3cc