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