Commit b0573a07918b30eddf28a453b57e466e818eca5f

Con Kolivas 2013-11-09T23:23:01

Merge branch 'master' into nogpu