Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  9 08:02:35 PDT 2014