Commit 108b1cd9ba58911da3529163386067f96c03f69b

DRC 2016-10-20T01:37:40

Merge branch 'master' into dev