Sync'd branch releases/aurora with upstream @ Mon Sep 22 08:56:37 PDT 2014