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