Merge remote branch 'alon/master'
bugfix: on newer versions of simplejson response.json isn't callable
Merge remote branch 'liraz/master'