Merge 2013 07 31

Hi @dannycoates I've merged your latest picl-idep commits into this repo.