Merge pull request #327 from wigyori/for-15.05-ndppd2