Bringing (rwd-strikes-back) branch up to date with master.