Commit 9ebc321cd10c949f2f422ab4fc262ae3eea7acb7

Con Kolivas 2012-11-05T23:34:58

Merge branch 'master' into gbt