Update old btn-small to new btn-sm and fix display bug with import/export in PageProperties.
Merge branch 'upstream/develop'