Sync'd branch releases/aurora with upstream @ Mon Sep 29 15:41:37 PDT 2014