21/07/2014 Update changes from jtalks-org:master into jarey:master

Update changes from jtalks-org:master into jarey:master