Update for development builds
Manual merge of SVN changes
Add missing files