svn-20130206
ded968e2 · Imported r3136 from trunk; see also 0a8969eb ·