Sync'd branch releases/aurora with upstream @ Fri Oct 10 17:05:49 PDT 2014