Merge branches 'gsoc-fields' and 'attr-placeholder' into gsoc-fields
Merge branch 'gsoc-fields' into attr-placeholder