Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 04:49:27 PDT 2014