Update master for all changes.
Commit done yesterday, May 9, 2013 has been corrupted due to aborted transfer of changes.