Sync'd branch releases/aurora with upstream @ Fri Oct 24 04:05:41 PDT 2014