Merge master commits 13/05/2014

Merge commits from branch master at 13/05/2014