Merge r5699 through r5703 from matthew's code completion branch
Authored by: vincent_cave 2012-08-26
Parent: [r5703]
Child: [r5705]