Merge dev into master 17-10-14 12:46:30