fixes for CRM-13056
Merge pull request #41 from kurund/CRM-13056

fixes for CRM-13056
patched CRM-13077
Merge pull request #43 from kurund/CRM-13077

patched CRM-13077
Merge remote-tracking branch 'upstream/7.x-4.3' into 7.x-4.3-7.x-master-2013-07-23-17-12-26