Merge remote-tracking branch 'upstream/master'

Merging changes up to 7/10/2014