Merge branch 'master' into austin2600-2012-04