Branched trunk into GDB-6.3 patch, so we can continue maintaining GDB6.3 patch, while making 6.4 the main focus.