Merge branch 'master' into bump_v0.6.7

This commit is contained in:
Victor Vieux 2013-11-21 17:40:29 -08:00
commit c61f57d040

Diff content is not available