7.x master

Fixes to issue - http://issues.civicrm.org/jira/browse/CRM-14072