Merge the fixes branch up so we can apply further AMD work.
Attach a file by drag & drop or click to upload
