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