Merged Nicolas's updates; not resolving yet as I'm having another pull coming.
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
Merged Nicolas's updates; not resolving yet as I'm having another pull coming.