Merged all changes from 20-10-2014 into master