merge ckanext-dashboard's master into my fork