resolving conflicts #456

Closed
georgebs wants to merge 3 commits from (deleted):master into master
No description provided.