Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Rashid Khan 2013-10-30 13:57:35 -07:00
commit d9410ed83c