Sync'd branch releases/aurora with upstream @ Fri Oct 10 07:19:47 PDT 2014