Merged in merge-upstream-2013-08-07 (pull request #1)

Merge with upstream