fba6c5c4cf4b525676d439d7425f031a9a60ceca not-for-merge branch 'master' of https://bitbucket.org/tmidas/mscb 5324b0acaa13e86766d6c5657a4747ebb88b1de7 not-for-merge branch 'pedantic_warnings_nik' of https://bitbucket.org/tmidas/mscb