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