Commit 8d3eeed2e9b49c296dfbd9bf29637bdba04d72d2

Con Kolivas 2012-06-23T23:54:05

Merge with master