Sync with powderblock:master