Sync'd branch releases/aurora with upstream @ Fri Oct 10 09:46:36 PDT 2014