Sync'd branch releases/aurora with upstream @ Fri Oct 31 09:20:37 PDT 2014