Sync'd branch releases/aurora with upstream @ Mon Sep 22 16:34:37 PDT 2014