merged master into your array pull request and resolved conflicts