Commit f538515079bc3af9b5b69f727b0810e57684af81

Vicent Martí 2013-07-15T09:45:04

Merge pull request #1728 from ivoire/small_fixes Small fixes