gdibble:master  <<<  TimSchlechter:master

merging trunk into branch