Sync'd branch releases/aurora with upstream @ Fri Oct 10 06:41:35 PDT 2014