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