Pablo AB - 2015-04-21

This bug is duplicate of #154.