Making the same improvement for the search API
Merge branch '2013.09.18'