Merge changes from master into 2.x in preperation for new release. #13

Closed craig8 closed 9 years ago