Merge pull request #308 from pwieczorkiewicz/nanny-mix-2
Merge branch 'master' into testing