Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  9 16:39:34 PDT 2014