Update to 20160505 snapshot with new upstream location.
PR: ports/209288 Submitted by: Tobias Kortkamp <t tobik me>