Sync with kurak/frail_pwr master on bitbucket.