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