Sync'd branch integration/b2g-inbound with upstream @ Mon Sep  8 09:33:37 PDT 2014