Written from Br2 (02/13/2014) #2
Merge pull request #2 from hans-sugarcrm/Br2

PR from Br2 to Br1