Commit 247b3f4ee5d08ee5f5f88eb1c0f6ed03cbd21fc9

Vicent Marti 2014-12-18T21:47:22

Merge remote-tracking branch 'origin/master_patch'