corrected merge of 12
Merge branch 'master' of https://github.com/bachy/esadhar-onsegit-2014