-- CRM-13340, this PR should be merged in 4.3, but merged in master so s...

...ending it again for 4.3 branch.

----------------------------------------
* CRM-13340: upgrading to (unreleased) 4.3.6 gets sql error on some sites
  http://issues.civicrm.org/jira/browse/CRM-13340