Sync'd branch releases/aurora with upstream @ Fri Oct  3 14:26:35 PDT 2014