update for master in anticipation of 0.9